merge emacs-23
authorKenichi Handa <handa@m17n.org>
Wed, 12 Jan 2011 06:10:56 +0000 (15:10 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 12 Jan 2011 06:10:56 +0000 (15:10 +0900)

Trivial merge